From cd2ff9ab026495c340394d6b19af198a28d98923 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 27 Jul 2005 00:00:05 +0000 Subject: [PATCH] Fix to be monotonic in the original size (#308145, Morten Welinder) 2005-07-26 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be monotonic in the original size (#308145, Morten Welinder) --- ChangeLog | 5 ++--- ChangeLog.pre-2-10 | 5 ++--- ChangeLog.pre-2-8 | 5 ++--- gtk/gtknotebook.c | 6 ++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08ff8fb494..8a015cec4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,7 @@ 2005-07-26 Owen Taylor - * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use - >= not > in deciding whether to subtract out x/ythickness. - (#308145, Morten Welinder) + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be + monotonic in the original size (#308145, Morten Welinder) 2005-07-26 Elijah Newren diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 08ff8fb494..8a015cec4c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,7 @@ 2005-07-26 Owen Taylor - * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use - >= not > in deciding whether to subtract out x/ythickness. - (#308145, Morten Welinder) + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be + monotonic in the original size (#308145, Morten Welinder) 2005-07-26 Elijah Newren diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 08ff8fb494..8a015cec4c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,7 @@ 2005-07-26 Owen Taylor - * gtk/gtknotebook.c (gtk_notebook_page_allocate): Use - >= not > in deciding whether to subtract out x/ythickness. - (#308145, Morten Welinder) + * gtk/gtknotebook.c (gtk_notebook_page_allocate): Fix to be + monotonic in the original size (#308145, Morten Welinder) 2005-07-26 Elijah Newren diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index eb18477885..881d310f57 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3611,14 +3611,12 @@ gtk_notebook_page_allocate (GtkNotebook *notebook, case GTK_POS_TOP: page->allocation.y += ythickness; case GTK_POS_BOTTOM: - if (page->allocation.height >= ythickness) - page->allocation.height -= ythickness; + page->allocation.height = MAX (1, page->allocation.height - ythickness); break; case GTK_POS_LEFT: page->allocation.x += xthickness; case GTK_POS_RIGHT: - if (page->allocation.width >= xthickness) - page->allocation.width -= xthickness; + page->allocation.width = MAX (1, page->allocation.width - xthickness); break; } } -- 2.30.2